Merge.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 28 Jul 2006 15:53:58 +0000 (16:53 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 28 Jul 2006 15:53:58 +0000 (16:53 +0100)
commit30ec81982666ed3db0e2ad0ea98252e6e4b1a2dd
treeaf3688337821a65776552211781cdbb9ed8dc446
parentb907e33985fbc5ab2aa17ada5dcb5b8e98307b26
Merge.
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c